@Author Drew Newman

*Cleaned up Tim's Code