started to reorganize some things