ussr

Results 2 issues of ussr

Errors are all over the codebase. I'm not sure if this is a result of the recent changes or if they were always there. I'm going to try to fix...

major refactoring