Encounters Errors, Do NOT merge, only commiting so I can acess form other workstation