Stage 1 complete - added classes