Faraday

Merging faraday stuff...