pull

ver 1.0
forms and functionality but correct base and view before showing