Constructs merge (code not active)

First pass for testing