OCD
Wont compile yet... still have a few problem classes