starting adding modal and a little better interface