Lot's of changes, won't compile