Make it basically working...