Added Foundation + Better Errors