Got some more work done

I will concentrate on making a working version of the website for now.