Finished it - works with test