WIP commit, building some error handling