Adding constructor checks on WorkPackage
Reintroducing some sections

I imagine these were commented out because there were no WPs and it
probably broke.
Added initial AMD's WP