Resolves #10
 - Removed a lot of the "final" keyword