fig bugs
merge
add permission system