TODO for 1.0:

Done, just need more test cases
