Added map support, player movement