Major update

Started over and re-did most everything. Much better now and more features.