Several things updated. Still not fully working as intended ;)