Updates

February 10, 2017 Working on adopting this from Crystal.