Working on adding the last software