Major edits to get this thing ready