Feature/bunomatic

Stage one of bunomatic. Please review.