Initial changes to setup for 1.6 update. Lib setup needs work still.