Modal

Several other huge improvements. Including the type being run before
everything else, which is very important.