Patched errors, now onto logic