Working on new API
Updated priority system