Move getter to a variable. Add some todo items.