almost ready to run
added some tests & fixed preset input parsing