Finishs tasks 1-6
Finishes tasks 1-6
Fixes merge issues.