first pass at modifying methods, fit still needs mad changes bro