REFRESH !

Re--thinking the structure seemed to help a lot. Hopefully, not a total
fuckup.
will this fix the bug?
Merge branch 'master' of https://github.com/Kreyo/hello_cruel_andrew