Files uploaded

All files uploaded to git. Some minor weird issues that were not present
before.

May require going back to the original framework (but will still copy
over many changes into that framework)