Recovered work after wierdo merge. Test pass