Jamie Campbell - 2008-03-09

use new class specification approach