1st JS commit

Still need to go over code logic