I like this much better muuuuch better! - should we make this backwards compatible?