A lot of new work, stuff works better, map can save points and stuff