Added parser code
Added misc functionality