done for now until monday!