More tests added
Rewrote parser
Added array support