Most functionality is working now