Freelancer:
Omstart
Valentines 2
This is an update for #15. Any more changes are welcome.