bug still exists, resetting to first commit to see if I can fix it