Master getting restored to a functional state... please be careful with commits in the future. Some stuff may still be missing.