Work-in-progress for 0.3; still have to add Jasmine test coverage for it.