started testing
still bugs but less