lots of changes
Looking pretty good now