mostly done, need to clean up and add notes