All functionality in place now