Moved holodeck stuff into grid.
Fixed player pickup.