Engine

Square hint merge (to be continued)