add shapes package
update todo