Working on #106. Commiting WIP.