Slight symbolsim refactor

Tests pass now