Adding boot2, convert lists to headers