big refactor to try to get working for sxsw and edu