Added in maps and bayesstuff. Still need to refine and clean both