cleanup and a completely unchecked attempt for #56. Im sure this doesnt work, but its so clean!