Adding new files that I'm working on, need to refactor and org. .scala
files