Updates to code I'm playing with