WIP - Adding in some debugging