Tweaked a few things and added a form