Filled things out a bit more... Ready for some review.