Lots of changes.. Almost there