init commit
Working code, need to refactor
Working Code, need to refactor + add functions
merge with remote