Refactoring

The Attempt model is still WIP
The Category model has a pending PR