Upgrade branch

This is an upgrade to the modern playdoh layout.