Started towards using sample files or stubs