1. Most functionality inplace after introducing common library