Split TODO into separate file