Begin to refactor
Moving to html5