Added stuff and moved stuff