Finished off first pass of attributes, need to apply them to appropriate classes.

Tidied up containers a little. Added color class. Made paint nicer.