Refactorings and we can now connect to risk! yay