added stuff, broke a bunch of stuff too...