Fixed... I think
Wiped
Added
Added test
Testing beta
Revert