Wip/p run

Remove all hard coded stuff - Trello card created.