Fixed up the database a bit and added a to do list