Finished

Did as much as I have time to do. Still not 100% complete.