Need some cleanup. Also; step into AP not enabled