moved stuff about to make cmon