Added main class and reenabled calculator actor
Added main class attribute