RFR

Not perfect.... Let me know how it is though!! :)
These two methods are identical -- pick one to use and delete the other.