Added some of John's stuff, waiting for A, J, & K