Have things working.  Code organization isn't as good as it could be.