WIP: work out naming stuff / parsing