handling CONSTRUCT
Merge remote-tracking branch 'origin/amsterdamDemo'