Lots

lots of changes