Major Update

See comments in parser.py
fixed conflicts