Add test coverage, and TODOs for features needing future implementation