Ok, I'll probably just axe it after merging this as it will be totally redundant.