re #4 code convention junction has been added. Some todo's were written