Moved out the status line stuff because it had no business being here