More Work
Hopefully this version will be used for the initial release, but thats up to the bug reporters

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