CORE-4446: finished implementing the parsing code and started adding unit tests