finished with some cruft