Prepare for even more drastic changes
Taking shape...