Adding base functional capture code before overhaul