Tweaked some stuff, I'll call this 0.2