Kinda useless to split out everything. Just make shuffle the optional one.