Finished merge
Added turn stuff