Started on spec; deleted some cruft