Half finished, just noticed a bug