Version 2.0, now with features!