Moving TODO to separate file