take org and space as arguments

Signed-off-by: Jesse Alford <jalford@pivotallabs.com>