some tests passing - need to fix multiple and add, then write integration tests