Last commit didn't work, added tests, finished functions, working on HTML