Making stuff modular (it's verified to work, now :D)

Yay, stuff.