WIP:Completing defines