Completed FastHenry
Also performed some tidying up of the folders.