forgot to commit work last week :( - still getting draft working, but making progress