New map added (not working), More graph stuff