used JSDoc and added more screen classes