More or less working, time to add new features