Sort:  

Most likely Yes and Yes, it's not ready for PR though, still too messy to get up a working version up quickly.