Worked a bit on basic class structure