* WIP commit * Consistent layers. * slight re-arrangement of code * log mime * fix tests * map -> array