first dev
new stuff & test
progress implementation & bug fixes