Added some WIP features.