Think I'm done, just need to run more tests.