More interfaces

Should have committed this months ago.