Almost done. JS has been separated into separate methods.