massive commit full of cool stuff!