Fix up opts passing. could probably be sent via self option too...