Initial checkins for server and master code