Add in lots of new stuff