reorganizing and simplifying code... work in progress