Moved stuff around to common