Tian

Read over my commits @arielspear  @GrantStampfli 
Ask me if there are questions.