Continued to update the code (mostly removing code for now)