Big changes

a lot of changes being done.