New changes, stuff for me to work on separately this weekend