Added esapi, started work on integrating it.