Pretty much everything is connected to the database now, just working out the details more