Filling stuff in

@meatballhat @skingry please sanity check - it's mostly copy/pasta