overhaul pt.2
aargh.. pt.3