started massive rewrite, deleted most of the classes