Added some hacks and TODOs. We are on the way!