latest stuff, to sync with git and pull from activtrades office