revamped

now works... somewhat