major structural overhaul, almost everything works now