back before merge

todo: test & fix bugs; modify UI