Added files and fixed warnings

Handle your switch cases, yo!