Notes
Clean up getters/setters
Start better user assignment and handling