Restructured everything, made it less hideously complex