diff --git a/distro/configuration/dispositions/dispositionConfig.json b/distro/configuration/dispositions/dispositionConfig.json
new file mode 100644
index 000000000..c36d8739b
--- /dev/null
+++ b/distro/configuration/dispositions/dispositionConfig.json
@@ -0,0 +1,26 @@
+[
+ {
+ "uuid": "66de7f60-b73a-11e2-9e96-0800200c9a66",
+ "name": "disposition.admit",
+ "type": "ADMIT",
+ "conceptCode": "CIEL:168619",
+ "actions": [],
+ "additionalObs": []
+ },
+ {
+ "uuid": "8297651b-4046-11ef-ba6a-0242ac120002",
+ "name": "disposition.transfer",
+ "type": "TRANSFER",
+ "conceptCode": "CIEL:167731",
+ "actions": [],
+ "additionalObs": []
+ },
+ {
+ "uuid": "12129630-b698-11e2-9e96-0800200c9a66",
+ "name": "disposition.discharge",
+ "type": "DISCHARGE",
+ "conceptCode": "CIEL:169401",
+ "actions": [],
+ "additionalObs": []
+ }
+]
diff --git a/distro/configuration/encountertypes/encountertypes_core-demo.csv b/distro/configuration/encountertypes/encountertypes_core-demo.csv
index ccbf5c506..32387a442 100644
--- a/distro/configuration/encountertypes/encountertypes_core-demo.csv
+++ b/distro/configuration/encountertypes/encountertypes_core-demo.csv
@@ -13,3 +13,6 @@ d7151f82-c1f3-4152-a605-2f9ea7414a79,,Visit Note,"Encounter where a full or abbr
39da3525-afe4-45ff-8977-c53b7b359158,,Order,Encounter for capturing orders,,,
29c02aff-9a93-46c9-bf6f-48b552fcb1fa,,Immunizations,Encounter for capturing immunizations,,,
36db5123-0ad5-41c0-9037-625b46e0ceef,,Mental Health Assessment,Mental Health Assessment,,,
+d3b07384-8d1c-4e6b-9b8e-2f3b8e4a1c9f,,Transfer,Indicates that a patient is being transferred into a different department within the hospital. (Transfers out of the hospital should not use this encounter type.),,,
+a1f5c3d2-4b6e-4e8a-9f2d-1b3e8e4a2d7f,,Inpatient Note,A short free-text note written by a clinician about an inpatient during their stay,,,
+b2c4d5e6-7f8a-4e9b-8c1d-2e3f8e4a3b8f,,Transfer Request,A stand-alone encounter type for a transfer request not part of a larger note,,,
\ No newline at end of file
diff --git a/distro/configuration/locations/locations-core_demo.csv b/distro/configuration/locations/locations-core_demo.csv
index c11ba2214..33ea00794 100644
--- a/distro/configuration/locations/locations-core_demo.csv
+++ b/distro/configuration/locations/locations-core_demo.csv
@@ -1,116 +1,60 @@
-Uuid,Void/Retire,Name,Description,Parent,Tags,Tag|Facility Location,Tag|Queue Location,Attribute|9eca4f4e-707f-4bb8-8289-2f9b6e93803c,Attribute|Last Audit Date,Address 1,Address 2,Address 3,Address 4,Address 5,Address 6,City/Village,County/District,State/Province,Postal Code,Country,_order:1000
-8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,Unknown Location,,,,,,,,,,,,,,,,,,
-44c3efb0-2583-4c80-a79e-1f756a03c0a1,,Outpatient Clinic,Outpatient Clinic,,Login Location,TRUE,TRUE,,,,,,,,,,,,,,
-ba685651-ed3b-4e63-9b35-78893060758a,,Inpatient Ward,Inpatient Ward,,Login Location,,,,,,,,,,,,,,,,
-8d9045ad-50f0-45b8-93c8-3ed4bce19dbf,,Mobile Clinic,Mobile Clinic,,Login Location,,,,,,,,,,,,,,,,
-1ce1b7d4-c865-4178-82b0-5932e51503d6,,Community Outreach,Community Outreach,,Login Location,,,,,,,,,,,,,,,,
-dbdaabf6-a326-4804-aba7-062073e05cd1,,Site 1,Site 1,,Login Location,,,,,,,,,,,,,,,,
-4a06a96f-dd21-4695-8d76-b9c405cebafc,,Site 2,Site 2,,Login Location,,,,,,,,,,,,,,,,
-d493f3eb-ba7c-4e6c-988d-62491e496045,,Site 3,Site 3,,Login Location,,,,,,,,,,,,,,,,
-dd2ad4cd-e33a-40cc-955a-e91e313f9a3b,,Site 4,Site 4,,Login Location,,,,,,,,,,,,,,,,
-94346397-3848-4b92-9219-a981ed4265f8,,Site 5,Site 5,,Login Location,,,,,,,,,,,,,,,,
-0566e68d-26ff-4e1d-a199-a9b8ecc3a7d4,,Site 6,Site 6,,Login Location,,,,,,,,,,,,,,,,
-9ade8976-a178-4bce-a229-50cfcf61b87d,,Site 7,Site 7,,Login Location,,,,,,,,,,,,,,,,
-50cfb6ca-a360-41f2-b3a0-7c5a19f4aa98,,Site 8,Site 8,,Login Location,,,,,,,,,,,,,,,,
-d5be46a5-3afa-40fa-86ab-3c1ff31543e3,,Site 9,Site 9,,Login Location,,,,,,,,,,,,,,,,
-5f47d469-7c8d-4f34-887c-16db797bec3d,,Site 10,Site 10,,Login Location,,,,,,,,,,,,,,,,
-d81f9408-1582-4270-848f-6af319424733,,Site 11,Site 11,,Login Location,,,,,,,,,,,,,,,,
-ffd78808-5b88-4a56-9c94-54754725ad90,,Site 12,Site 12,,Login Location,,,,,,,,,,,,,,,,
-a61a5145-8da1-4410-be23-479314814cc7,,Site 13,Site 13,,Login Location,,,,,,,,,,,,,,,,
-5e6abb9d-7ab3-4203-8b02-1462bcca0c51,,Site 14,Site 14,,Login Location,,,,,,,,,,,,,,,,
-6536f254-a296-4d0f-84f7-9c0f0b12536e,,Site 15,Site 15,,Login Location,,,,,,,,,,,,,,,,
-0cb740b2-153f-49e2-b599-aabb90330bd2,,Site 16,Site 16,,Login Location,,,,,,,,,,,,,,,,
-2cead8f3-0e6c-468b-9f10-6a7ca75604dd,,Site 17,Site 17,,Login Location,,,,,,,,,,,,,,,,
-facac3e6-8c4a-4528-a497-8cf22ffd1a50,,Site 18,Site 18,,Login Location,,,,,,,,,,,,,,,,
-29fc4038-18d4-4b11-bc2b-63983932e6ac,,Site 19,Site 19,,Login Location,,,,,,,,,,,,,,,,
-c84338a5-69a7-411a-aa0f-f405cb44697b,,Site 20,Site 20,,Login Location,,,,,,,,,,,,,,,,
-09d08c88-5b12-4831-8268-62242822180d,,Site 21,Site 21,,Login Location,,,,,,,,,,,,,,,,
-ac529390-16d6-4454-83be-4fcbbc5988aa,,Site 22,Site 22,,Login Location,,,,,,,,,,,,,,,,
-b03c3107-fc5b-4b49-a31d-02bf327d6dd4,,Site 23,Site 23,,Login Location,,,,,,,,,,,,,,,,
-302090a6-11ac-455d-80c9-08c06ebd1087,,Site 24,Site 24,,Login Location,,,,,,,,,,,,,,,,
-bb5787d4-307e-40ec-89b3-f9f539a5d88f,,Site 25,Site 25,,Login Location,,,,,,,,,,,,,,,,
-13ecc2c0-7170-4d51-a93d-7189fd885c05,,Site 26,Site 26,,Login Location,,,,,,,,,,,,,,,,
-6dfacc57-17e6-481e-bde6-36742bf2bb66,,Site 27,Site 27,,Login Location,,,,,,,,,,,,,,,,
-2425adbe-b446-4d70-a684-5d757370a230,,Site 28,Site 28,,Login Location,,,,,,,,,,,,,,,,
-d114a8ac-aa7e-4350-a8bf-de2caf0ea440,,Site 29,Site 29,,Login Location,,,,,,,,,,,,,,,,
-ca22282f-0d68-4c1c-a985-90b69cf943a3,,Site 30,Site 30,,Login Location,,,,,,,,,,,,,,,,
-8d976ed0-49fe-4ed9-909d-f7b9d4081712,,Site 31,Site 31,,Login Location,,,,,,,,,,,,,,,,
-370c2cff-4681-40fa-bd29-b557399a6486,,Site 32,Site 32,,Login Location,,,,,,,,,,,,,,,,
-3ad56ffe-05bc-4ccf-aa87-f517f65e10fd,,Site 33,Site 33,,Login Location,,,,,,,,,,,,,,,,
-d38b9028-8035-4595-84ca-c8e7c9e2ecd4,,Site 34,Site 34,,Login Location,,,,,,,,,,,,,,,,
-07032097-5031-4c93-a29a-52a14d124a0a,,Site 35,Site 35,,Login Location,,,,,,,,,,,,,,,,
-aaf478f9-b3e2-4038-977b-56896a8060e2,,Site 36,Site 36,,Login Location,,,,,,,,,,,,,,,,
-9a93ba80-8a44-4f99-980c-b1e13dbca33a,,Site 37,Site 37,,Login Location,,,,,,,,,,,,,,,,
-5c0ff819-e936-4e75-9c1d-4d001a6fd95e,,Site 38,Site 38,,Login Location,,,,,,,,,,,,,,,,
-743a7d4a-3404-49db-a0ec-beddbdec0919,,Site 39,Site 39,,Login Location,,,,,,,,,,,,,,,,
-1b1317ae-3688-416d-a8f0-1378b92b9e04,,Site 40,Site 40,,Login Location,,,,,,,,,,,,,,,,
-c2861e47-ecc1-4e81-992d-7b3c29fce0b0,,Site 41,Site 41,,Login Location,,,,,,,,,,,,,,,,
-92dbdbdf-17da-4cf0-873c-ad15dfae71cb,,Site 42,Site 42,,Login Location,,,,,,,,,,,,,,,,
-fd7fae67-7a2e-456c-81db-3cbdb10fd510,,Site 43,Site 43,,Login Location,,,,,,,,,,,,,,,,
-2ccae22b-26ab-4c40-a813-55462e27a0c8,,Site 44,Site 44,,Login Location,,,,,,,,,,,,,,,,
-2ef7caf2-affa-4003-8fe7-128db6ce31ee,,Site 45,Site 45,,Login Location,,,,,,,,,,,,,,,,
-148dc112-9e26-42f9-b514-e28cf2e44b1f,,Site 46,Site 46,,Login Location,,,,,,,,,,,,,,,,
-6d49188b-2bdf-4c6e-bdff-7eeed3e15a64,,Site 47,Site 47,,Login Location,,,,,,,,,,,,,,,,
-0fa578fc-301a-418c-9cf9-b35707fcb478,,Site 48,Site 48,,Login Location,,,,,,,,,,,,,,,,
-eeba7391-361a-41ad-a884-02d5504abaac,,Site 49,Site 49,,Login Location,,,,,,,,,,,,,,,,
-2592d89f-8655-464e-bb76-5536d394c276,,Site 50,Site 50,,Login Location,,,,,,,,,,,,,,,,
-184ac7d9-225a-41f8-bac7-c87b1327e1b0,,Ward 1,Ward 1,,Login Location,,,,,,,,,,,,,,,,
-5a7f3c53-6bb4-448b-a966-5e65b397b9f3,,Ward 2,Ward 2,,Login Location,,,,,,,,,,,,,,,,
-2272b8cd-b690-4878-a50c-40d22235b3f3,,Ward 3,Ward 3,,Login Location,,,,,,,,,,,,,,,,
-820eae5e-e3e9-40a3-9e86-41d874572cf7,,Ward 4,Ward 4,,Login Location,,,,,,,,,,,,,,,,
-f105e38c-6ea4-418a-a0ae-9aa39b7f991c,,Ward 5,Ward 5,,Login Location,,,,,,,,,,,,,,,,
-3848c2f7-1ffa-4ee8-a3eb-cc4a3d939be1,,Ward 6,Ward 6,,Login Location,,,,,,,,,,,,,,,,
-43a62c8c-d0e3-46f6-8ff7-7c7c153d73d7,,Ward 7,Ward 7,,Login Location,,,,,,,,,,,,,,,,
-3b4dff4d-ec74-4742-ba09-50b9b89eb3af,,Ward 8,Ward 8,,Login Location,,,,,,,,,,,,,,,,
-a47e5316-4f78-4007-b92a-627de0b0fe2c,,Ward 9,Ward 9,,Login Location,,,,,,,,,,,,,,,,
-988f96fb-e0ae-4819-8e8d-ec37dc8e3292,,Ward 10,Ward 10,,Login Location,,,,,,,,,,,,,,,,
-4047a80b-65d9-4fec-bdc9-0f205c06ba2c,,Ward 11,Ward 11,,Login Location,,,,,,,,,,,,,,,,
-0108eb6a-6478-4f87-9425-d7164eb91acb,,Ward 12,Ward 12,,Login Location,,,,,,,,,,,,,,,,
-c117a236-8e65-4327-bb60-42c46db4f6de,,Ward 13,Ward 13,,Login Location,,,,,,,,,,,,,,,,
-af81eb43-3c83-419d-a394-9e1a24e4ce63,,Ward 14,Ward 14,,Login Location,,,,,,,,,,,,,,,,
-532a3eef-5e37-4e1a-b60d-6b901e49ba88,,Ward 15,Ward 15,,Login Location,,,,,,,,,,,,,,,,
-61c952e0-cc51-4ccb-90e3-fd1602f24e92,,Ward 16,Ward 16,,Login Location,,,,,,,,,,,,,,,,
-a5fb6b17-7634-453a-acf6-898545b5324a,,Ward 17,Ward 17,,Login Location,,,,,,,,,,,,,,,,
-99eb8204-c704-49f3-bbc7-1e1eeb37c365,,Ward 18,Ward 18,,Login Location,,,,,,,,,,,,,,,,
-c76bde7e-4240-4d2f-822b-61dc6bc09d36,,Ward 19,Ward 19,,Login Location,,,,,,,,,,,,,,,,
-3b1c8620-7f69-4657-a010-4f649889f60d,,Ward 20,Ward 20,,Login Location,,,,,,,,,,,,,,,,
-059e5941-e813-43c9-93b7-b5793e27e4c2,,Ward 21,Ward 21,,Login Location,,,,,,,,,,,,,,,,
-48b931de-31b2-41d7-9cd1-c5c63d4ce7cf,,Ward 22,Ward 22,,Login Location,,,,,,,,,,,,,,,,
-2e2fabfa-ca65-414e-b1c2-a04679fe64df,,Ward 23,Ward 23,,Login Location,,,,,,,,,,,,,,,,
-89ed3c56-2618-4d56-b995-09a09994eea8,,Ward 24,Ward 24,,Login Location,,,,,,,,,,,,,,,,
-c2e201b4-72db-4233-b3e6-fc8fdb6ac71e,,Ward 25,Ward 25,,Login Location,,,,,,,,,,,,,,,,
-53f4acf6-5c7a-4946-8df7-491a58eaaa91,,Ward 26,Ward 26,,Login Location,,,,,,,,,,,,,,,,
-9f25f4cf-5566-47b4-a254-44b1943840d7,,Ward 27,Ward 27,,Login Location,,,,,,,,,,,,,,,,
-9d33bf8e-a6ed-44c0-8677-9237481df256,,Ward 28,Ward 28,,Login Location,,,,,,,,,,,,,,,,
-e886e814-987d-4f83-933d-4f31c700e0a4,,Ward 29,Ward 29,,Login Location,,,,,,,,,,,,,,,,
-b1d037c5-b487-4c3d-b7c1-0b0a7b50bfd1,,Ward 30,Ward 30,,Login Location,,,,,,,,,,,,,,,,
-99c120e1-6e4b-4df1-ad2c-f81a50dfda7d,,Ward 31,Ward 31,,Login Location,,,,,,,,,,,,,,,,
-7c4c7c7f-523e-4cd4-b2d8-7bd8036788c7,,Ward 32,Ward 32,,Login Location,,,,,,,,,,,,,,,,
-f277520e-91af-4ea1-98a2-f011e6f85a37,,Ward 33,Ward 33,,Login Location,,,,,,,,,,,,,,,,
-84b2819f-cdb5-47f9-88f4-825131bb6afa,,Ward 34,Ward 34,,Login Location,,,,,,,,,,,,,,,,
-4738f9f4-ca34-4f9f-9e89-d7a2ba2b51a3,,Ward 35,Ward 35,,Login Location,,,,,,,,,,,,,,,,
-13b6681c-ae49-4f76-a5c6-24013d1bd7ec,,Ward 36,Ward 36,,Login Location,,,,,,,,,,,,,,,,
-3b6c2971-7a90-4076-baff-28f327e2ff9e,,Ward 37,Ward 37,,Login Location,,,,,,,,,,,,,,,,
-49d7321a-0ee6-419e-8c74-96554a1902e1,,Ward 38,Ward 38,,Login Location,,,,,,,,,,,,,,,,
-d5b5cf4e-e5fc-44c8-b19b-99bae46f7914,,Ward 39,Ward 39,,Login Location,,,,,,,,,,,,,,,,
-de7aa639-6cdb-4184-9171-235316d8aa6d,,Ward 40,Ward 40,,Login Location,,,,,,,,,,,,,,,,
-d212de33-7757-4899-b347-2cc693635b55,,Ward 41,Ward 41,,Login Location,,,,,,,,,,,,,,,,
-6534f987-9d1a-442a-a336-da6d62b25301,,Ward 42,Ward 42,,Login Location,,,,,,,,,,,,,,,,
-f8e92d51-9072-4cf0-9af2-7eb30b077c11,,Ward 43,Ward 43,,Login Location,,,,,,,,,,,,,,,,
-b120e051-c927-4ff6-9307-f90c8ded63ca,,Ward 44,Ward 44,,Login Location,,,,,,,,,,,,,,,,
-d1572bd9-ad63-4acc-9c2d-5e1dd0aeea99,,Ward 45,Ward 45,,Login Location,,,,,,,,,,,,,,,,
-0f9194e3-f7ff-438b-9319-387925cd6310,,Ward 46,Ward 46,,Login Location,,,,,,,,,,,,,,,,
-d14dd072-2f21-4340-b13d-845da00f8b28,,Ward 47,Ward 47,,Login Location,,,,,,,,,,,,,,,,
-3ebe38d4-ec5c-49c3-b498-0ca98c15f410,,Ward 48,Ward 48,,Login Location,,,,,,,,,,,,,,,,
-689d68a5-5857-48af-9f26-dc374fdf2997,,Ward 49,Ward 49,,Login Location,,,,,,,,,,,,,,,,
-736b08f9-94d6-4b50-ad58-6bc69b9cbfb8,,Ward 50,Ward 50,,Login Location,,,,,,,,,,,,,,,,
-4bc65b7a-bcd6-4829-860c-310aaf2c74db,,Ward 51,Ward 51,,Login Location,,,,,,,,,,,,,,,,
-14e1afa1-fa96-41b0-bfaa-a7aff2659ee6,,Ward 52,Ward 52,,Login Location,,,,,,,,,,,,,,,,
-8d243ead-936f-4bc8-b8a6-95baa2ed5217,,Ward 53,Ward 53,,Login Location,,,,,,,,,,,,,,,,
-9212bcda-32dc-4fb8-a517-8ade92908816,,Ward 54,Ward 54,,Login Location,,,,,,,,,,,,,,,,
-b8457ebe-48cd-4e6b-8139-23b269017d45,,Ward 55,Ward 55,,Login Location,,,,,,,,,,,,,,,,
-423ca603-a696-4a25-a00f-2e998df01a9f,,Ward 56,Ward 56,,Login Location,,,,,,,,,,,,,,,,
-9b35114a-a1cc-400c-ba1e-ee61538feeb7,,Ward 57,Ward 57,,Login Location,,,,,,,,,,,,,,,,
-aa661b2b-bf9f-4335-965c-9dcb5b6adf94,,Ward 58,Ward 58,,Login Location,,,,,,,,,,,,,,,,
-8874c0eb-be2b-4c9c-926c-bdd1e4394b99,,Ward 59,Ward 59,,Login Location,,,,,,,,,,,,,,,,
-2faca5a9-bfce-4cdc-8e09-690411230bcc,,Ward 60,Ward 60,,Login Location,,,,,,,,,,,,,,,,
\ No newline at end of file
+Uuid,Void/Retire,Name,Description,Parent,Tag|Login Location,Tag|Visit Location,Tag|Facility Location,Tag|Queue Location,Tag|Admission Location,Tag|Transfer Location,Attribute|9eca4f4e-707f-4bb8-8289-2f9b6e93803c,Attribute|Last Audit Date,Address 1,Address 2,Address 3,Address 4,Address 5,Address 6,City/Village,County/District,State/Province,Postal Code,Country,_order:1000
+8d6c993e-c2cc-11de-8d13-0010c6dffd0f,,Unknown Location,Unknown Location,,,,,,,,,,,,,,,,,,,,,
+f47ac10b-58cc-4372-a567-0e02b2c3d479,,Ubuntu Hospital,Ubuntu Hospital,,,TRUE,,,,,,,,,,,,,,,,,,
+44c3efb0-2583-4c80-a79e-1f756a03c0a1,,Outpatient Clinic,Outpatient Clinic,Ubuntu Hospital,TRUE,,TRUE,TRUE,,,,,,,,,,,,,,,,
+ba685651-ed3b-4e63-9b35-78893060758a,,Inpatient Ward,Inpatient Ward,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
+8d9045ad-50f0-45b8-93c8-3ed4bce19dbf,,Mobile Clinic,Mobile Clinic,,TRUE,,,,,,,,,,,,,,,,,,,
+1ce1b7d4-c865-4178-82b0-5932e51503d6,,Community Outreach,Community Outreach,,TRUE,,,,,,,,,,,,,,,,,,,
+184ac7d9-225a-41f8-bac7-c87b1327e1b0,,Ward 1,Ward 1,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
+5a7f3c53-6bb4-448b-a966-5e65b397b9f3,,Ward 2,Ward 2,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
+2272b8cd-b690-4878-a50c-40d22235b3f3,,Ward 3,Ward 3,Ubuntu Hospital,TRUE,,,,TRUE,TRUE,,,,,,,,,,,,,,
+dbdaabf6-a326-4804-aba7-062073e05cd1,,Site 1,Site 1,,TRUE,,,,,,,,,,,,,,,,,,,
+4a06a96f-dd21-4695-8d76-b9c405cebafc,,Site 2,Site 2,,TRUE,,,,,,,,,,,,,,,,,,,
+d493f3eb-ba7c-4e6c-988d-62491e496045,,Site 3,Site 3,,TRUE,,,,,,,,,,,,,,,,,,,
+dd2ad4cd-e33a-40cc-955a-e91e313f9a3b,,Site 4,Site 4,,TRUE,,,,,,,,,,,,,,,,,,,
+94346397-3848-4b92-9219-a981ed4265f8,,Site 5,Site 5,,TRUE,,,,,,,,,,,,,,,,,,,
+0566e68d-26ff-4e1d-a199-a9b8ecc3a7d4,,Site 6,Site 6,,TRUE,,,,,,,,,,,,,,,,,,,
+9ade8976-a178-4bce-a229-50cfcf61b87d,,Site 7,Site 7,,TRUE,,,,,,,,,,,,,,,,,,,
+50cfb6ca-a360-41f2-b3a0-7c5a19f4aa98,,Site 8,Site 8,,TRUE,,,,,,,,,,,,,,,,,,,
+d5be46a5-3afa-40fa-86ab-3c1ff31543e3,,Site 9,Site 9,,TRUE,,,,,,,,,,,,,,,,,,,
+5f47d469-7c8d-4f34-887c-16db797bec3d,,Site 10,Site 10,,TRUE,,,,,,,,,,,,,,,,,,,
+d81f9408-1582-4270-848f-6af319424733,,Site 11,Site 11,,TRUE,,,,,,,,,,,,,,,,,,,
+ffd78808-5b88-4a56-9c94-54754725ad90,,Site 12,Site 12,,TRUE,,,,,,,,,,,,,,,,,,,
+a61a5145-8da1-4410-be23-479314814cc7,,Site 13,Site 13,,TRUE,,,,,,,,,,,,,,,,,,,
+5e6abb9d-7ab3-4203-8b02-1462bcca0c51,,Site 14,Site 14,,TRUE,,,,,,,,,,,,,,,,,,,
+6536f254-a296-4d0f-84f7-9c0f0b12536e,,Site 15,Site 15,,TRUE,,,,,,,,,,,,,,,,,,,
+0cb740b2-153f-49e2-b599-aabb90330bd2,,Site 16,Site 16,,TRUE,,,,,,,,,,,,,,,,,,,
+2cead8f3-0e6c-468b-9f10-6a7ca75604dd,,Site 17,Site 17,,TRUE,,,,,,,,,,,,,,,,,,,
+facac3e6-8c4a-4528-a497-8cf22ffd1a50,,Site 18,Site 18,,TRUE,,,,,,,,,,,,,,,,,,,
+29fc4038-18d4-4b11-bc2b-63983932e6ac,,Site 19,Site 19,,TRUE,,,,,,,,,,,,,,,,,,,
+c84338a5-69a7-411a-aa0f-f405cb44697b,,Site 20,Site 20,,TRUE,,,,,,,,,,,,,,,,,,,
+09d08c88-5b12-4831-8268-62242822180d,,Site 21,Site 21,,TRUE,,,,,,,,,,,,,,,,,,,
+ac529390-16d6-4454-83be-4fcbbc5988aa,,Site 22,Site 22,,TRUE,,,,,,,,,,,,,,,,,,,
+b03c3107-fc5b-4b49-a31d-02bf327d6dd4,,Site 23,Site 23,,TRUE,,,,,,,,,,,,,,,,,,,
+302090a6-11ac-455d-80c9-08c06ebd1087,,Site 24,Site 24,,TRUE,,,,,,,,,,,,,,,,,,,
+bb5787d4-307e-40ec-89b3-f9f539a5d88f,,Site 25,Site 25,,TRUE,,,,,,,,,,,,,,,,,,,
+13ecc2c0-7170-4d51-a93d-7189fd885c05,,Site 26,Site 26,,TRUE,,,,,,,,,,,,,,,,,,,
+6dfacc57-17e6-481e-bde6-36742bf2bb66,,Site 27,Site 27,,TRUE,,,,,,,,,,,,,,,,,,,
+2425adbe-b446-4d70-a684-5d757370a230,,Site 28,Site 28,,TRUE,,,,,,,,,,,,,,,,,,,
+d114a8ac-aa7e-4350-a8bf-de2caf0ea440,,Site 29,Site 29,,TRUE,,,,,,,,,,,,,,,,,,,
+ca22282f-0d68-4c1c-a985-90b69cf943a3,,Site 30,Site 30,,TRUE,,,,,,,,,,,,,,,,,,,
+8d976ed0-49fe-4ed9-909d-f7b9d4081712,,Site 31,Site 31,,TRUE,,,,,,,,,,,,,,,,,,,
+370c2cff-4681-40fa-bd29-b557399a6486,,Site 32,Site 32,,TRUE,,,,,,,,,,,,,,,,,,,
+3ad56ffe-05bc-4ccf-aa87-f517f65e10fd,,Site 33,Site 33,,TRUE,,,,,,,,,,,,,,,,,,,
+d38b9028-8035-4595-84ca-c8e7c9e2ecd4,,Site 34,Site 34,,TRUE,,,,,,,,,,,,,,,,,,,
+07032097-5031-4c93-a29a-52a14d124a0a,,Site 35,Site 35,,TRUE,,,,,,,,,,,,,,,,,,,
+aaf478f9-b3e2-4038-977b-56896a8060e2,,Site 36,Site 36,,TRUE,,,,,,,,,,,,,,,,,,,
+9a93ba80-8a44-4f99-980c-b1e13dbca33a,,Site 37,Site 37,,TRUE,,,,,,,,,,,,,,,,,,,
+5c0ff819-e936-4e75-9c1d-4d001a6fd95e,,Site 38,Site 38,,TRUE,,,,,,,,,,,,,,,,,,,
+743a7d4a-3404-49db-a0ec-beddbdec0919,,Site 39,Site 39,,TRUE,,,,,,,,,,,,,,,,,,,
+1b1317ae-3688-416d-a8f0-1378b92b9e04,,Site 40,Site 40,,TRUE,,,,,,,,,,,,,,,,,,,
+c2861e47-ecc1-4e81-992d-7b3c29fce0b0,,Site 41,Site 41,,TRUE,,,,,,,,,,,,,,,,,,,
+92dbdbdf-17da-4cf0-873c-ad15dfae71cb,,Site 42,Site 42,,TRUE,,,,,,,,,,,,,,,,,,,
+fd7fae67-7a2e-456c-81db-3cbdb10fd510,,Site 43,Site 43,,TRUE,,,,,,,,,,,,,,,,,,,
+2ccae22b-26ab-4c40-a813-55462e27a0c8,,Site 44,Site 44,,TRUE,,,,,,,,,,,,,,,,,,,
+2ef7caf2-affa-4003-8fe7-128db6ce31ee,,Site 45,Site 45,,TRUE,,,,,,,,,,,,,,,,,,,
+148dc112-9e26-42f9-b514-e28cf2e44b1f,,Site 46,Site 46,,TRUE,,,,,,,,,,,,,,,,,,,
+6d49188b-2bdf-4c6e-bdff-7eeed3e15a64,,Site 47,Site 47,,TRUE,,,,,,,,,,,,,,,,,,,
+0fa578fc-301a-418c-9cf9-b35707fcb478,,Site 48,Site 48,,TRUE,,,,,,,,,,,,,,,,,,,
+eeba7391-361a-41ad-a884-02d5504abaac,,Site 49,Site 49,,TRUE,,,,,,,,,,,,,,,,,,,
+2592d89f-8655-464e-bb76-5536d394c276,,Site 50,Site 50,,TRUE,,,,,,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/distro/configuration/locationtags/locationtags-core_demo.csv b/distro/configuration/locationtags/locationtags-core_demo.csv
index aaf4bef7b..3c3dddaa2 100644
--- a/distro/configuration/locationtags/locationtags-core_demo.csv
+++ b/distro/configuration/locationtags/locationtags-core_demo.csv
@@ -2,3 +2,6 @@ Uuid,Void/Retire,Name,Description
b8bbf83e-645f-451f-8efe-a0db56f09676,,Login Location,"When a user logs in and chooses a session location, they may only choose one with this tag"
a2327745-2970-4752-ac8a-dd0ba131f40e,,Facility Location,
,,Queue Location,
+f5b9737b-14d5-402b-8475-dd558808e172,,Admission Location,Patients may only be admitted to inpatient care in a location with this tag
+9783aba6-df7b-4969-be6e-1e03e7a08965,,Transfer Location,Patients may only be transfer to inpatient care in a location with this tag
+e2a1b3c4-d5e6-7890-1abc-def234567890,,Visit Location,A location where a patient may have a visit
\ No newline at end of file
diff --git a/distro/configuration/metadatatermmappings/metadatatermmappings-core_demo.csv b/distro/configuration/metadatatermmappings/metadatatermmappings-core_demo.csv
index 3aa6d21e3..6c461f4db 100644
--- a/distro/configuration/metadatatermmappings/metadatatermmappings-core_demo.csv
+++ b/distro/configuration/metadatatermmappings/metadatatermmappings-core_demo.csv
@@ -1,3 +1,9 @@
Uuid,Void/Retire,Mapping code,Mapping source,Metadata class name,Metadata Uuid,_order:2000
b7c8adf5-c875-4e78-bb4b-fea391b1de55,,emr.primaryIdentifierType,org.openmrs.module.emrapi,org.openmrs.PatientIdentifierType,05a29f94-c0ed-11e2-94be-8c13b969e334,
-d5b1abfd-3f1c-4489-bc48-318018407b47,,emr.extraPatientIdentifierTypes,org.openmrs.module.emrapi,org.openmrs.module.metadatamapping.MetadataSet,f0ebcb99-7618-41b7-b0bf-8ff93de67b9e,
\ No newline at end of file
+d5b1abfd-3f1c-4489-bc48-318018407b47,,emr.extraPatientIdentifierTypes,org.openmrs.module.emrapi,org.openmrs.module.metadatamapping.MetadataSet,f0ebcb99-7618-41b7-b0bf-8ff93de67b9e,
+e1a1b2c3-d4e5-6789-0abc-def123456789,,emr.admissionEncounterType,org.openmrs.module.emrapi,org.openmrs.EncounterType,e22e39fd-7db2-45e7-80f1-60fa0d5a4378
+f2b3c4d5-e6f7-8901-2bcd-ef3456789012,,emr.exitFromInpatientEncounterType,org.openmrs.module.emrapi,org.openmrs.EncounterType,181820aa-88c9-479b-9077-af92f5364329
+a3c4d5e6-f7g8-9012-3cde-f45678901234,,emr.transferWithinHospitalEncounterType,org.openmrs.module.emrapi,org.openmrs.EncounterType,d3b07384-8d1c-4e6b-9b8e-2f3b8e4a1c9f
+b4d5e6f7-g8h9-0123-4def-567890123456,,emr.inpatientNoteEncounterType,org.openmrs.module.emrapi,org.openmrs.EncounterType,a1f5c3d2-4b6e-4e8a-9f2d-1b3e8e4a2d7f
+c5e6f7g8-h9i0-1234-5ef0-678901234567,,emr.transferRequestEncounterType,org.openmrs.module.emrapi,org.openmrs.EncounterType,b2c4d5e6-7f8a-4e9b-8c1d-2e3f8e4a3b8f
+c9d6f8e2-3b4a-4e6b-9f8e-1a2b3c4d5e6f,,emr.clinicianEncounterRole,org.openmrs.module.emrapi,org.openmrs.EncounterRole,240b26f9-dd88-4172-823d-4a8bfeb7841f
\ No newline at end of file
diff --git a/distro/configuration/ocl/openmrs_IPD-DEMO_v1.4.0_autoexpand-1.4.0.2024-10-19_015216.zip b/distro/configuration/ocl/openmrs_IPD-DEMO_v1.4.0_autoexpand-1.4.0.2024-10-19_015216.zip
new file mode 100644
index 000000000..b6d201c3a
Binary files /dev/null and b/distro/configuration/ocl/openmrs_IPD-DEMO_v1.4.0_autoexpand-1.4.0.2024-10-19_015216.zip differ
diff --git a/distro/distro.properties b/distro/distro.properties
index 7091e9709..ee8745323 100644
--- a/distro/distro.properties
+++ b/distro/distro.properties
@@ -28,5 +28,9 @@ omod.ordertemplates=${ordertemplates.version}
omod.patientflags=${patientflags.version}
omod.o3forms=${o3forms.version}
omod.authentication=${authentication.version}
+omod.emrapi=${emrapi.version}
+omod.event.groupId=org.openmrs
+omod.event=${event.version}
+omod.bedmanagement=${bedmanagement.version}
omod.stockmanagement=${stockmanagement.version}
omod.billing=${billing.version}
diff --git a/distro/pom.xml b/distro/pom.xml
index cbb687f42..973db6291 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -35,7 +35,7 @@
1.9.0
2.4.0
3.5.0-SNAPSHOT
- 2.4.0
+ 2.5.0-SNAPSHOT
2.4.0
2.0.0-20240305.062514-14
2.0.0-20230831.113926-1
@@ -49,6 +49,9 @@
1.0.2
3.0.8
2.3.0
+ 2.1.0-SNAPSHOT
+ 2.10.0
+ 6.0.0
2.0.2-SNAPSHOT
1.2.0-SNAPSHOT
@@ -202,6 +205,24 @@
${o3forms.version}
provided
+
+ org.openmrs.module
+ emrapi-omod
+ ${emrapi.version}
+ provided
+
+
+ org.openmrs
+ event-omod
+ ${event.version}
+ provided
+
+
+ org.openmrs.module
+ bedmanagement-omod
+ ${bedmanagement.version}
+ provided
+
org.openmrs.module
stockmanagement-omod
diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
index ce092b6bb..523b4fe3c 100644
--- a/frontend/spa-assemble-config.json
+++ b/frontend/spa-assemble-config.json
@@ -2,6 +2,7 @@
"frontendModules": {
"@openmrs/esm-active-visits-app": "next",
"@openmrs/esm-appointments-app": "next",
+ "@openmrs/esm-bed-management-app": "next",
"@openmrs/esm-cohort-builder-app": "next",
"@openmrs/esm-devtools-app": "next",
"@openmrs/esm-dispensing-app": "next",
@@ -37,6 +38,7 @@
"@openmrs/esm-service-queues-app": "next",
"@openmrs/esm-system-admin-app": "next",
"@openmrs/esm-user-onboarding-app": "next",
+ "@openmrs/esm-ward-app": "next",
"@openmrs/esm-stock-management-app": "next",
"@openmrs/esm-billing-app": "next"
},