Re-work initialisation with necessary stuff