First changes

Includes testing post and bunch of commented out code
Original files comes from http://erjjones.github.com/