more testing and controller additions