get stuart position working + adding waves