General update

Mainly worked on adding hosting functionality, which resulted in related
changes