Merged everything but database

Whoop whoop