commit
duh
pasted dev code
changes
Merge branch 'dev' into mags
final for thurs
cleaning merges