Queue works, need to clean up though.

Works. Now time for some clean.