A few kinks still need to be worked out, fixed others