some tests
removed unneeded junk, the main logic is almost done