got functionaility and tests working now