Adding dodgy solution 2, fixing makefiles and template.