cleaned up structure and started adding some mixins