Updated to add in some of the things I want