refactor march
lab 7 and lab 8 done except pretty print