adding the whole shebang