got a bunch more work done. partials working, etc