Das a lot o' changes

Signed-off-by: ShadowChild <shadychild12@gmail.com>