Lots of stuff I added