removed finished TODOs and added unit6 function.