Beta Commit

Have commented out the older exceptions method and replaced with the options selector exception form

Signed-off-by: Elliot Taylor <elliot@raison.co>