First full commit of HASPECT code