WIP, update factories with auto creates