added good progress now
updated the ui and other logic