Map tests done, now working on it for real :)