Initial Commit
Switched internal representation