Merging in the front end to the pyramid project