merged both html proof-of-concepts (will need fixing)