Converted to new class syntax

Closes #4