RFR

Not perfect.... Let me know how it is though!! :)
Remove commented code