Cleaned up views, added mixes, still much work to do