partial refactor of slots. Want to do commit just to ensure everything is up to date.