Adding approaches 1 and 2, and moving some files around