Added casting, knocked more items off the todo