oops

much spaghetti code