dev progress
functionality done