Adds TODOs and comments

Might need to implement new structure and state switch for MAC rules.