Wip/p test

Created a trello for this.