commiting bug fix... messy code that requires cleanup