got some tests working, not as bad as I feared.