Todo cleanup and new idea