Initial code commit (what I have so far)