Backup before big update

big update

Currently latest working version