More Beta Crap

Redo of old crap not entirely done