WIP - added a bit more