Profile System Update

- More work on the profile system