Item 1 is done
Merged master fixed conflict