1. Workin on moving code to separate library