Mass commit, no idea what I did. Apparently forgot to commit stuff in ages.