movement fixed, laser needs re-write