More work in progress changes to bgq branch