Finished and reported. Pushed to Github later because of issues.