#374 Modifactions

Still cuaseing freeze, uploading current code.