wip for the manatee refactoer