Added enum.. needs work