committing initial work from a while ago.