Merge things

Merge annie's stuff and mine