Almost got it all working as before