Added all functionality and design