Starting to move the direction I want.

Much left to do.