Start shift to common lib for base functionality