Started adding mapstring generation stuff