long pending commits.. no idea how much conflict this will cause..