Fix #1 and start revammping REST API