main.js working and somewhat mergeable with the master.