Jeremy working

Going to have some merge issues with Rick's stuff, but here we go!