Fixed positioning, laid framework for reprice for real
Merge branch 'master' of https://github.com/ScottyWired/AVDD