feature complete

first version feature complete and working