Only slightly borked the styling in the rupert form
Merge branch 'develop' of github.com:yarmiganosca/charleses into develop