Shipyard stuff

Lists added for shipyard.
Minor shipyard fix

I forgot to call the method that populates the lists.
Merge pull request #37 from vcnickerson/Connor3

Connor3