Add more computer logic, still bugs