Slice check

This will need a rebase before merging...