started adding parsers and such
more changes [ci-skip]