more stuff done, got it working blah blah