added todo
fixes
refactor
merge develop