Prior to starting Kotlin Conversion of main server (Test converted)
More stuff converted.