Branch/study abroad 405 [DO NOT MERGE]

waiting to check with @Angelamariewatson to see if we have the correct behaviour