working towards demo still