Manger method implemented at 90%
Fixed git conflict
Fixed git conflict