Updated amulet.
Moving to use extend instead of declare
More use of extend