working on prettying things up