Cleaning up a little

Starting testing + maybe adding rules