collab with oomf

will updaye with more scenarios l8r