Tiberius 2.5

* Might have to revert stuff but here is a start

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>