cha, cha, changes

Some stuff and updates.
Next step will be text formatting