another couple of additions still just fleshing it all out