Cleaned up tons of code, most things are working again now.  Getting ready to finish the demo release.