Now call me crazy, but wouldn't it make a lot of sense to make as many things as possible LESS complicated, moving forward in time at this point.

Especially if it didn't need to be complicated or difficult in the first place.