Done with 1a-f and 1h, still finishing tests