Version 4.0 - Part 1 done (I think and hope)