First version where it's actually working! Wooooooooo.