Begin fixing up standard trial class