Fix 1

Testing and such