i forgot to commit all of my changes for the last week or so

Signed-off-by: epicfinley <epicfinley@gmail.com>