Less hacky

I dun derped with the @Optional - works now though