Minor change
Re-added simple calc. Switched to Swift