still trying to get some tests passing