added todo / design changes