draft stop model
partial refactor of stop model