Feature/aw refactor

I have re-factored the BWA decider