Time to commit stuff before I loose it I think...