Lot's of changes yaaaay!