Finished 2nd stab at Percolation class