works and needs work
Merge branch 'master' of github.com:crawfordforbes/smashCRUD
needs work but works