working now
added TODO in source
more TODOs