Basic functionality ready.
Updated TODO.