initial commit
Working version
WIP Commit