Started adding some DB-stuff and some other things
IoC headache