First commit from aaron

I typed some stuff, please review.