Initial tweaking and basically matching up with @cobyism\'s belfastbot