major overhaul needed. be back whenever...