Initial Conversions to IntelliJ