Almost everything is working, will continue to add features