Got rid of Calculator.cs and replaced it with Matrix.bat