master: Added Frame and calculator