basic functunality complete
minor