Working Beta

Shady files have to be converted over