(Added) - more work on html + script