Added test, started parsing functions !