Fixed issue that happened because I hadn't included all the necessary bundles + some comments
adjusted
Fixed issue and removed TODO