translated existing system to better format, WIP