Added achievements, and started with changes to Trevor