Updated Database, Refactored a smidge, did a bit of query optimization and slapping together more cross functionality.