Pieces now can be conquered (along with some more refactor)