Project compiling properly
Added TODO comments to know where to keep working the following day