final commit potfields and square are wonky