Making it into actual mod rather test. Code and (class)names refactoring!