Added 4 categories, refactored the factory thingy so its fully closed to
modification