Added initial code / design Comp