more work on parsing stuff. about to re-do args bit
I think that's better.