Initial Commit
Working on some refactoring
Added untracked files