working feature branch, ready for customer demo