Small additions, I'm still working out how I want things to work.