Also, feel free to start adding more stuff, since I'm not going to work on it more until tomorrow.