merging 04-10

merging front-end code in to server-api