Re-written regex, started 'x' implementation.