Kind of final version for now.