V 2.1.6

More build out and logic fixes