commit of what I've been working on for the past bit