More classes, started some map stuff