Initial rework to make it reuseable
0.0.2