UC1, UC2 and UC3 refactored.
Merge pull request #48 from Tibo-lg/HomePortRefactored

UC1, UC2 and UC3 refactored.