Update 2.1

Finished id to readline.
Started the id matching.
- NOT WORKING -