Dev. checkpoint.
Fixed: location was not being specified.
Dev. checkpoint: conforming to new logic layout