Some functionality back

But bug riddled