Tried to dry everything up but that introduced problems with populating the db