Feature

This feature is driving me mad. So much to write about and so little time! Doesn't help that we've got 3 deadlines all due in next week!