Git ignore
Refactor some of the state stuff
Update gradle