A few more bug fixes, initial architecture for Priority