add more functions
condense code into functions
add detailed data