Making tests pass for now, working on edge case