Almost finished. I need to add demo & one more thing