Everything now self contained