Initial revision - WIP.