Created by: alexzywiak
Fix Git mess I made. Update to latest CRA, consolidate custom AM code to single commit.