Adding AOBD - Closes #6