Working on state encapsulation...still

About to try creating "Drawable" classes to streamline this...