Everything appears to work, just some testing left