played around with some ideas and styling for #17