Added level 3.
Code clean hub. Removing commented out things. Renaming for clarity.