Changed to capitalized class names
Added option for more OO