More WIP on CSS
Initial work on the JS side of things