Tweaked the preptool, still working on getting keyboard navigation functional