moved stuff + wip