almost done, just need to add separator lines