More work, new additions, cleanup. WIP