WIP - add some more information