finished fixing method names - added todo notes where required