Rolled back

This no makey the sensy, but at least this version works except for brace_bad!