The start of a cleanup, I may be switching OSes soon so I wanted to commit what I had

Signed-off-by: Daktyl198 <rootme198@hotmail.com>