more todo and some graphics