Adding work in progress code with squirt fix