WIP 09.27.2014

Clean up some of the mess with Process/Host