Add functionality needed for SP

@jbirdjavi 
Delete.  :)