Fix minor mistake
Committing current design prototype for rollback purposes later
Second prototype. Fairly happy with this one.