Craig dev

Updated a bunch