Major refactor
Update gems