Latest batch of code. Yay!