Progress on skeleton to entity conversion, started converting constraints to entities