lots of stuff went down, gitgitgitgit gitcommit