Initial Commit

Working. Now will go cleanup code.
additional changes

additional changes