Added mixins and compass pieces, cleaned up code