In the middle of Javascript overhaul (everything broken)