Moved client forwards into proper include file