breaking stuff, major but awesome changes in progress