just a few more updates. the code is still broken, but it's getting closer.