Added a bit of testing and moving stuff around to enable more.