3rd week meaningful commit

Only Two of Five features currently working…