Fun

Combining all changes into the main branch.