Added todo's.
Speed-up through early return.