Playing around with getting rid of extranous plugin stuff, rely on explicity callbacks, etc.