Let's try and make my Factories not Box like and do some other stuff