This bug might be bigger than I thought. Trying something out.