HTML Project WIP, some refactoring