Better testablity & domain wrapper
oops