Almost works
Clean up