Pushing the re-written code bulk before merging for master