basic overhaul
basic overhaul
minor cleanup, more to come