Fork of Chris' Mudlet2 branch