did some testing, added some todo's :-)