Continue working on high-level classes