Refactored most things to use classes and now have basic finding working