Now feature complete as far as I can tell.

Going to call this BETA