Registration working - but buggy