First checkin of changes to wokring designs