Branch/study abroad 405 [READY TO MERGE]

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