added more stuff, not sure where I was, diving back in