derpalerps and extras

Change-Id: I6be788ea272da0e9dc2fabfa300522002d05b67d