Son of a duck

Fixed, personally I think I waffled way too much, so I may revisit it tonight. The core content will remain the same either eay