Already doing stuff, but missing a lot of logic