Even further abstraction!

I am picking apart much of the code and categorizing things better
within their respective classes.