Many changes, added HTML file for testing