Switching back to Q
Moved stuff around
Updating
Error handling TODO