setup
more setup
merge
added loop and more
added parser