Backup nearly working version
Cosmetics
Finally builds!