Implement control strategies / refactoring
Add calendar entry for profiles