and even more stuff (ALMOST DONE!)