Issue 27 For some initial review... 

Before I start implementing this all over the place!