removing TODOs from specs, problem solved