Started work on classes