Merge changes I have made locally during these past weeks

Some things may not work spotlessly but I plan on re-doing the queues and tidying up the synchronous responses, so hopefully it will be better soon.