Separate out attrs; add cycle