Lots more tweaks and changes, need to finish working through my issues views