seth's changes

lots of changes lots of broken