Added files from RobQuistNL's branch

https://enrise.atlassian.net/browse/BWA-3