Finish up #and_invoke_original functionality. Implement specs