everything working and refactored for CRUD leanness