Made a bunch of changes. A lot more stable now but still work to be done.