Redesigned the thing a bit and additions! (What a useless commit
message, sorry)