Commit 6 - Redone classes