Finally got this fixed up!