started MASSIVE 1.8 rewrite, still not finished