Map stuff added, maybe works?