An hour of refactoring and adding created_at