Add flags struct as well as more instructions