Merge login increment

The code runs fine on my computer. I suspect that there may be some unintentional leftover code in the files that were automatically merged, but we can deal with that later.