Updated to reflect BDS changes
Major update fixing a number of issues and adding new features v1.3