trying to slim down so it doesnt take forever to load
Merge branch 'slim'