Commit #15
Started stat checking in edit