Another attempt to get around buildcontrol problems. Not loving that system at the moment.