Clean up method setting logic, add some todo's