Pull request for Issue63 - Still not finished, want to create this now for people to review.