Added Functions Class
Setters and getters
Implemented initialize
Conflict Merge
Conflict Merge
Conflict Merge