Added more functionality. Starting to come together.