Began some new classes
Converted tabs to spaces for formatting