Tidbits and added a bunch of TODOs :-)