way too many changes, map layout nearly functional enough for demo