moved stuff around to make it importable