cleaned up completely, still not working