Progress #01 to #05

Progress #06 to #07