MostlyWorking

There are still a few bugs remaining, but most of it is working.