Always a work in progress. Saved some space with a new expansion tank too.

http://imgur.com/a/7EaqN