A few issues, a bit dirty and need bug control