working on formatting and stuff