Worked on some skill stuff.
Merge changes.