More argument moving for flag

(This wont compile because I need to fix the flag enum implementation)