I should've done all this before the intial commit