Cleaning up autocomplete
Adding to the TODO
Upgrading Doctrine