Fixed datadir to a fixed / hardcoded - need to corect this