Tried to move to a better division of labor; testing incomplete
Added todo