Develop

Changes I've made locally in order to get the application running- what I believe is the most correct up to date code.