added some drafting. changed naming