A lot of new stuff

A lot of new stuff