Trying to add in the new stuff