Cleaned code and started implementing scaffolding step
Cleaned code and started implementing scaffolding step

ppericard/matamog,ppericard/matamog,bonsai-team/matam,bonsai-team/matam,ppericard/matam,bonsai-team/matam,ppericard/matam,ppericard/matamog,bonsai-team/matam,ppericard/matamog,ppericard/matam