still working on some formating issues