still need to finish 2 small pages and polish UI