Refactoring fun

also changing some of the methods... nothing really done yet.