WIP - Add a record generator