Lots of changes to get this working