1. Working on moving code to separate library