Added basic create/remove logic