Refactor, actually create records