added new stuff
lots of progress