New updates
Committing to merge our stuff