Last updates for the night, continue migration tom

Signed-off-by: Chad Allen <chad@awsmlabs.com>