-Changes I had to make to get this to import correctly using intellij.

Signed-off-by: Disk1of5 <disk1of5@gmail.com>