resolves #1 #2 # #4, adding newer changes, moving inventory behind signon