N*1.3 Almost finished first complete implementation