more progress on sub classes
finished pending tests
finished and tested. Removed code class