Initial work on a version using less HTML