More work

Still working on em.