Updated how skills are stored. Cleaner, but still need a better design.