Finalizing validation logic (now actually working ;)