Move unfinished functionality to the top