Initial commit, we'll call this the beta

Super regex help from @jarednorman and @jnorth.
Update test files, we're passing!