More changes. Putting up the test site to Github soon.