Fleshed out more stuff, need to reclone