Update

It still needs work, but this is where I'm at.