initial commit of latest refactor and server install updates