Initial revision for test
Initial drawing for #1 complete