working now just need to make pretty