still trying to get everything in order