Finished pickup subsystem (#77)

I've finished it. I've also added javadocs (pulled from master first).