Initial recording support
More work on recording