Basic editing is almost done, can start working on real features soon