WIP commit moving towards working server support.