Made ships modular and changed Hashtable a little