Work on core.clj to work with webapp. Some renaming and rework of end-to-end