Working at getting to compile with latest rust