added setup and moved stuff