Lots of changes since last commit, biggest thing is that database interactions are now present though not complete.