Progress on basic class outline