#2 Added untracked files (candidate for moving to lib folder)