Misc updates, added server and basic builder