Organisation

Added some more comments to want I plan to do.