More code out of old components. Build is working now.