Working on the re write.
Finished rewrite.