Wow, so many changes. I need to commit more!

Signed-off-by: Pamelloes <pamelloes@gmail.com>