continued dev and testing