Working on the tools... still a WIP