back on testing branch. will do some testing later