actually added some stuff. total overhaul.