Some TODOs and 色々. :rooster: