First rookie commit, cleaned up class structure
Actually adding shit