BIg commit
3 things