my second commit, now with staging stuff