Added populating of machine configs.. not working yet