trying to reorganize some things..