Added map etc, test commit