Added in statics, moved functions to methods, and improved the testing