a little progress on design side but unfinished