got most tests working