mostly done. A HUGE bunch of bugs inside to be fixed.