A little more complete. (Still WIP)