finished 98% of writing, commiting changes for review